Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream sync #282

Merged
merged 46 commits into from
Oct 22, 2023
Merged

Upstream sync #282

merged 46 commits into from
Oct 22, 2023

Conversation

KayzelW
Copy link
Collaborator

@KayzelW KayzelW commented Oct 22, 2023

No description provided.

asperger-sind and others added 30 commits October 19, 2023 18:19
c4 is reduced to 2 from 4 and the bundle to 12 from 20
Co-authored-by: coolmankid12345 <[email protected]>
* change rotations of botany tools

* change gas tank wide swing rotation
* start work

* remove crafting things

* remove

* fix yml

* remove all pebbles
add sand stone
add sand cobblestone wall
add asteroid cobblestone wall
resprite basaltand snow walls

* add new walls

* :trollface:
* added more slang to the sanitization manager

* idk why this file is here

* Added new sanitization accent

* No longer is an acccent, instead is a dictionary

* Reverted back to a system similar to before, added the new netspeak from the dictionary

* Added some new words to the chat san

* Added (wdym --> what do you mean) to the chatsan

* merge conflict

* removed boolvalue

* remove space

* Upcoming

* Added MF and ETC to chatsan :))

* upcoming

* added FYI and WYD to speech-chatsan.ftl

* Made the chatsan accent string a const string with [ValidatePrototypeId<AccentPrototype>]

* forgot the ';' :(((

* fixed error throw [AccentPrototype] --> [ReplacementAccentPrototype]
* This was supposed to be a challenge

* Component magik

* Add documentation
deltanedas and others added 13 commits October 22, 2023 16:51
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Added sprites

* Added item in game

* Ditched glowing light indicator to simplify implementation

* Added clipboard to locker fill

* Added traitor objective

* forgor meta.json

* forgor clip textures on front-facing in-hand sprites

* lowered concussiveness of bureaucracy

* added remote cargo ordering, paper sucking, and removed paper on spawn

* slightly reduce storage capacity so it can fit in backpacks
@KayzelW KayzelW requested a review from Rxup as a code owner October 22, 2023 07:56
@Rxup Rxup merged commit 7d40dd2 into master Oct 22, 2023
7 checks passed
@Rxup Rxup deleted the upstream-sync branch October 22, 2023 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.